Backport 103542 from trunk.
authorGlenn Morris <rgm@gnu.org>
Sun, 13 Mar 2011 22:36:47 +0000 (18:36 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 13 Mar 2011 22:36:47 +0000 (18:36 -0400)
commit11aba41a0c36f5a1d12445d66628e74a5a49c4e1
treef6e498b09b733b050c7ed3e75a4e484a1c7c40f5
parent52fc9a9b1749967ef9691907c45d85dff4a04034
Backport 103542 from trunk.

* configure.in (FREETYPE_LIBS): Actually set it to something.

* configure.in: Don't zero-out FONTCONFIG_CFLAGS and
FONTCONFIG_LIBS when building with XFT (doing so is incorrect, as
Emacs directly uses fontconfig, and breaks building when using a
strict linker).
ChangeLog
configure.in